Correct syntax error in xen-init-list

(cherry picked from commit bbd22332c24478f86a5cff52531c1bc3697d8d96)

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 80e1e6ff7d6f7d07fe45e74d24bb651be9dacb72..e7b0a1b30aeb632b37953963ad4b32f0582df9f1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ xen (4.8.0-1~) unstable; urgency=high
   * Remove correct pidfile when stopping xenconsoled.
   * Check that xenstored has actually started before talking to it.
     Incorporate a timeout so as not to block boot (Mitigates #737613)
+  * Correct syntax error in xen-init-list when running with xend
+    (Closes: #763102)
 
   [ Lubomir Host ]
   * Fix xen-init-name to not fail looking for a nonexistent 'config'

diff --git a/debian/scripts/xen-init-list b/debian/scripts/xen-init-list
index 6a9ddbca7abc1c90bb87a22fb10d42990d9733c1..f5741bbfe3d94f250447eadb0f40ab26c08e2870 100755 (executable)
--- a/debian/scripts/xen-init-list
+++ b/debian/scripts/xen-init-list
@@ -51,7 +51,7 @@ class DataJSON(Data):
 
 class DataSXP(Data):
     def __init__(self, p):
-        s = SXPParser()(p)
+        s = SXPParser.loads(p)
         self.data = d = {}
         for i in s:
             if i and i[0] == 'domain':